Removed conflicting code