Remove unneeded after blocks; more specs.