Better quitting.
Remove unecessary checks