fine-tune builtins, add clean target