Remove more unused logic