remove more 'self' references from the JS days