Removes unused fish functions and renames other ones.

Signed-off-by: Claudio Ortolina <claudio@jumpzero.com>