redistribute responsibilities and clean up