Removed some dead example code and did some house cleaning