Optimization changes, removing pox components1