Code cleanup for dev kits