Reenabled builtins and did some cleanup