Cleanup, remove primitive booleans
Add support for holes