Removing even more redundant stuff