Minor clean-up regarding initial database configuration