More tweaks and started removing unneeded sections