Update Db Model and cleanup API Controller code.