Remove dead macro code
Remove superfluous sprite update code
Refactor and speed up sprite code