Removed dead code detected by dependency analyzer