Update access check and remove unused filter.