Remove old / broken code