Cleanup of unneeded stuff.