Removed uneeded code.  Fixes conflict with other plugins