got rid of boost; code cleanup