Cleaned up some unused code/comments