Rewrite paypal config model, cleanup