47 removed some unnecessary code
#447 #421 fix database issue