Some use statements and cleanup