removing code not relevant to current feature