Removed some strange stuff