WIP Better exceptions

Remove unused using statement