Removed extra stub code from master