got rid of Canvas class