Removed some legacy code. But some probably still remains...