Clean up master for starter kit