Brilliant idea to remove a few checks in modules