remove other double code to keep in masters track