remove more code

Signed-off-by: Max Brunsfeld <mbrunsfeld@pivotallabs.com>