cleaning up master for merge