Found some unneeded stuff