More entity yak shaving