Cleaning up all other code