Revert "Basic source fixes"

This reverts commit 6b8b763eb20ae37e6e9be64aab85f2e79183284d.