Removing support for 1.8