* remove extra lines around if/elses
* remove functions that are included in the base