Merged with Boots updates/fixes - Code cleanup