Remove obsolete code

[LordOfPolls]

Is your feature request related to a problem? Please describe if so.
The code has a lot of obsolete or repeated code, at some point we should have a mass cleanup

Describe the feature you'd like
Clean up the code of obsolete or repeated code

Describe alternatives you've considered
Trying to ignore it