General cleanup

removed and sort unused usings
removed unreferenced exception variable e (not required if not used)