Removes unecessary manager declaration
Merge branch 'master' into sandbox