Filtered out old classes - still need a long term solution