clean up; build with ubuntu gcc 4.8