Remove unneeded stuff
Code style/cleanup