[-]Remove more uneeded code, slowly cleaning all the code up