Cleaned up files except semantic