removed not-needed data lookups and checks