Final Commit, code cleaned up, unused files removed