Cleaned up after merge