Resolving #59
Removing old remote code