Cleaned up after wrong merge