General fabfile cleanup