deleting a whole heap of shit that should not be here