Removed unused code
More commit