These 2 lines should be removed