Removed optimize package
Common compiles again after simplification