Cleaned out some dead code