Consumer and industrial 2-in-1 cleaning compositions providing both detergency and rinseability in a single cleaning composition are disclosed. Alkaline-based cleaning compositions containing a surface modification polymer and an alcohol alkoxylate nonionic surfactant, and methods of using the same provide user-friendly, solid, detergent compositions without the need for using a separate rinse aid composition.