[Issue 183] [WIP] removes useless returns in remove_word method