Clean up for removing support for wimax helper service