Removed commented out elements