EUCA-6498

I removed the -f chunk of code relating to a discussion in EUCA-6498.