Cleaned up stubs.