Removed useless files and added no direct access to db helper