Cleaned and resharpered all entities