Removing unsed fields and imports