Cleaned some stuff that wasn't used anymore

Signed-off-by: Jeroen van Baarsen <jeroenvanbaarsen@gmail.com>