Fix latest commit bugs.
Clean up