This line should also be removed