Deleted more unnecessary stuff