Cleaned up default functions file