Remove unnecessary try/except
Cleanup