a bit cleanup for deployment to AppFog