Removed unneded sample subs from generation