Deadcode removed