Removed the unnecessary and unused fuel handler, and added in some more
filtering for emc