Clearned out the unused code