Cleanup unneeded stuff