cleaned up everything