Unnecessary feature cleanup