Ok after I get the forks and BB out tomorrow, I'll get to cleaning the frame while I let the components that need it sit in evapo-rust. Here is what I've come up with as a cleaning plan so far:

1. Rinse with water then dry.
2. Use Simple Green or dishwashing liquid? Will the work the same? How much soap to water?
3. WD-40 or Windex to remove grease/oil. Rinse with water. (Would a real “degreaser” work better here?)
4. Meguiar’s Scratch-X to polish and remove micro-scratches. I've already got a bottle of this laying around which is a plus.
5. Car wax (Meguiar’s?)

Any advice here? Is any of this overkill for what I'm working with? Am I doing things in the right order?

Thanks!