Revert "not sure why there were extension methods"

This reverts commit 67866b78bce7bc1034ea7b0daac365fb408354f5.