buildfile cleanup