Removing zenstrap and zenstrap dependencies