Removed unused
Bug fixed