Cleaned up unused stuff