Cleanup
Use Ds and Dao in IndexController instead of direct sql