Remove test code
Merge branch 'kamaln7/kick'