more remove code changes