Not sure what these were but we may as well keep them as the whole
module is going to be udpated quite significantly.