Remove unused code pt.2