removed more unused thnigs