Removing legacy import and test/boostrap