Removed builtins logic