Removing 3.1 support :()