Handle some more exceptions
Remove unnecessary methods