fix issue - remove old code