Clean up towards functional, kept the project plan in, so far.