Cleaned up everything