cleanup work for initial contribution to Eclipse project