DIOR-59 removing stuff handled by ec2bootstrap

i think...