removed some auto-added stuff - just hacking here