Forgot to remove some unused methods