Not fecking needed
Buttload of cleanup