Cleaned up optimizations packages definitions