Cleaned up and change remotes to generic