Removed commented out items for troubleshooting