Cleaned up from half-failed Catapult deploy

@robertdimarco - please review and merge. 1.6.4 is out.