[Cleann]Rename and remove unecessary