some cleanup, still need to fill in skeleton files