finished remove of define statements