Cleaning up of unused stuff