#1 - Removed unused code and css.