removed hard-coding on cleanup