Remove library code, SWT changes