cleaned up, left extra stuff in bulky branch