Cleaned up buggy changes from merge