Remove Logs and add if case for when there is not building id