Removed commented code per request