Database: removed unused code