changed Remove return value
corrected double key remove