Cleaning up IWC API