Remove unneeded dependencies
Enable simple optimizations