remove elance test and submit some util classes