Remove unused/non-working stuff