Clean up codefor submission