misc housekeeping and remove unnecessary method