Merge change I3e370934

* changes:
  remove classes from the preloaded list