Removed some now obsolete stuff...