Full clean up and simplication complete