Remove what seems like dead code