Trim down and update build makefiles