moved sensor specific stuff out of core code