Cleaned up everything, removed unneeded stuff