Remove more v1 crap

Signed-off-by: Sharif Olorin <sio@tesser.org>