Develop/jh cleanup

Just some cleaning. Thoughts?