Remove Cursor
More Optimizations