post ORM update and code cleanup