cleanup removed useless stuff