removed some strange things