Cleaned out old code