Cleanup and remove old code.