Database code cleanup

Signed-off-by: Akusari <daniel.mehrmann@gmx.de>