Removed old and usused code