removing 'window' variables