Remove warnings; Prune number of exceptions out there