Cleaning up code for migration to EstackSS LLC Website