Stripping and updating for 1.8.0