Remove builtin operations
Adjust rendering