Cleaned entity files