Removed IRC imports and minor logic change