Move remaining vars to top of file
Remove stepped content section