Removed "static" entities, they are only fitlers for real entities and don't need any kind of representation in our software