Remove unused code
More info on feature post-its