Forgot to remove more things