OBANYC-2113: Removed dead code