Consolidating the sub headers

Also removed the support agreement part