CLEANUP for boskee merge. removed junk files