These are no longer needed or being used.

Signed-off-by: Dave Airlie <airlied@redhat.com>