Add section markers to Carton file
Remove unneeded code and clean-ups