Remove empty files
CS fixes
Allow FormHelper to use the appropriate class