Cleaned up old outcommented code