adjusted db import
cleanup