Removed unused and commented code