Remove old code and tests