Going through code, removing unneeded stuff