Removed some left-over code