Pull request for code cleaning

Yay smart events! Yay not having old junk!