forgot to remove 2 unused methods