Remove more redundant stuff