Clean up to get ready for code import