Remove a bunch of unused cruft from the interface while we're at it
--HG-- extra : convert_revision : d4e19afda897bc3797868b40469ce2ec7ec7d251