Clean up manifest

Signed-off-by: Corey Maylone <corey@livioconnect.com>
Add saving of server type