Finally cleaned up shittyclient.