Remove old redunant code