Last problem and clean up