Removed the hardcoded goos

Signed-off-by: Ryan McDonald <rjmcdonald83@gmail.com>