Remove rquirement checks outside of templates