More unused code removal
using hashmap.contains() is no longer appropriate or guaranteed to work consistently on all platforms (I think.  its a legacy method anyway).  Switched to .containsKey