removing redundant stuff