Cached comilation works
Remove a bunch of redundant (post zinc) source