Clean up injection annotations, add ProxyMethod annotation