Fix source and remove obsolete conditionals
Add changelog