removing unnecessary unused use statements and cleaning further up