Some cleaning up of unused stuff