Remove unused classes and mark some test as "Incomplete"