Cosmetic changes and getting rid of unnecessary things