deleted more unnecessary stuff