Removed commented out nonsense