Fixed bugs. Extended clean to force call dependent attributes before performin rest of clean.