Even more cleanup... was a little bored =)
Security commit.