Merge branch iefix into prelaunch
added rm-* stuff and got rid of unnecessary function block