Cleanup and licence change to EPL