CS fix
Remove dead code.  Move form type into Type directory.