removed references to App