An attempt to clean up everything