add hints to DB, remove unused code