Started cleanup ... removed all Andor specific functions