removed try/unneccerly codes