Cleaned up botched merge