removed more redundant stuff