Get rid of an old hack
Changes here and there