getting rid of more cf classes, I ain't gonna need 'em when I'm done with this site