Removed commented out functions