Removed deperacted DB helper
Small changes in dispatcher
Restyle to Allman
Removed deprecated methods