Fix quality flaw: remove unused code