Tariq cleanup spt 2016

Topics: .