Git Cleanup Commit

Committed all current code and cleaned up old, deprecated code no
longer in use