Remove targets for consolidated build