+1 on removing this class