Eliminate need for clip
Remove generated stuff