Remove unused check methods
Remove two unused classes