Pruned out un-needed/deprecated methods, added comments.