more cleanup, throwing out code which we don't need