some housekeeping
feature is done