removed some useless panics