ALM-210 fixed rake cleanup tasks