Removed some not needed data ...