remove unnecessary code
add rectangle wip
rect-stroke working WIP