Remove old requires, add discover stub