Cleanup a lot of things. Began to use service implementation and config file for database access