cleanups

• Scotty
• contravene
• gangster
• waster
• toke
• whats