Removed unneeded classes. Sorry Bernhard :)