Fix remaining spec and remove old stubs.

Signed-off-by: Matthew Boedicker <mboedicker@pivotallabs.com>