WIP: rm extraneous stuff