Drawing cleanup (in progress)