removed unused logic and styles