removed remaining objects with leading underscore