Clanup code. Remove warns. Remove unused checked exception