Remove redundant stuff