revisit remove closure method
cleanup