Remove conditions and some cleanup