Minor reorganisation of deprecated stuff