fix errors
took out condition.cpp and condition.h