Massive Cleanup (Hence the name of this branch XD)