Got rid of old/unneeded code