removed testing lines and functions