Some cleanup. Not finished yet.