Clean-Up on some unneeded stuff