Added remove_action and updated feature registration