Cleaned out dead code