Versioning was trickier than I thought. Rolling back to non-versioned scheme. Fix formating and removed logging