maybe we will see @thyageshm 's implementation of clean up first--he is applying this for now