mainly changes related to cleanup