cleaning up code that was just bad and left over stuff.
Merge branch 'cleanup_code' into develop