Remove unnecessary functionality

[nnyyxxxx]

Type of Change

• [x] Refactoring

Description

I didn't know if you wanted to keep the extra functionality or not so I made two pull requests going based off of this, please review both before deciding.

Testing

Works

Issue related to PR

• Conflicts with #264
• Might conflict with #282
• Closes #264

Checklist

• [x] My code adheres to the coding and style guidelines of the project.
• [x] I have performed a self-review of my own code.
• [x] My changes generate no errors/warnings/merge conflicts.