Removed unused function, theme clean-up