removed unused/old bits and alphabetized lists so steve can find things easier