Removed commented out sections