Simplification of stubs