Removed unnecessary code.  Fixed rename bug