Removed old (bad) code