Trimmed down some unused code