Some cleanup and fixing static analysis errors. Remove not used blocks from the start packs.