FLOE-160: More namespace change. Also remove a not-in-use script that was accidentally pushed up.