Changed url & cleanup