Removing redundant stuff