More cleanup... all props getting persisted to DB