Add registrationID push support;   clear some code.