removing/reverting stuff for PR