Remove name and proxy attribute, Cleanup unrequired code