Database init now works + Cleanup