Cleaned up generated junk