[CLEANUP] Cleaned up some unneeded code and commenteed some methods