tidy up and comment
deleted old and unused stuff