Mem leak fix

Think the meta programming in the BUILD was the problem - might be okay in an anonymous class (not sure).