Removed unnecessary unit indicators