DirectCanvas - separate classes cleanup