Removed a couple of unused files
Added a check to see if the address is valid
Fixed a typo