Removed unnecessary user retrieval