cleaned up last commit, removed extra, unnecessary code