Removed old and unused code