Removed proxy/plugin system to avoid possibly unneccessary complication. Fixes here and there as well