cleaned up unused stuff