Removing more unnecessary stuff