cleaned some parts of the system