Removed commented out code belonging to feature branch