Remove un-needed code, redesign class objects, moved to API2, created only for sending messages