remove unused use statements and cleanup