CE-26 Removing unused piece of code