Remove more redundant code