Remove trailing _ cautioness