Taken away unused code