cleaned up unused members