removing more unnecessary stuff