Some cleanup
Save to server for imported pdf working.