clearing out the old over-structured code