Refactor and clean up unused css class