Cleaning Up
Moving non-ORM code