Cleanup to state of comiple and test possible.