Removed logging and temp setup