Remove Canvas Dependency