Removed traces and cleaned up.