Clean up stubs