Added macro to test for existence of a method call
removed unnecessary stuff
deleted unnecessary stuff