Remove two unused classes