Initial refactoring

Began stripping out old code in preparation for conversion to bootstrap
theme