-Commenting unused functionality. This was bothering me way too much.