Removed commented cleanup