Further code cleanup. Removed unnecessary Logs and appContext conversions.