Derp fixing and removed unneeded proxies

Signed-off-by: ShadowChild <shadychild12@gmail.com>