Repackaged expressions, removing unnecessary classes