better cleaning + @Dynamic handling