Removed temp code/comments, uncommented useful code