Remove
Changes in DB Implementation