Remove unused form
Add exceptions