Cleaned up more cruft

Signed-off-by: 5n4k3 K33p3r <5n4k3@snakepitsoftware.com>