Remove unused variable
Move check into sub class