Cleaned out unused code