cleaning up working branch
more cleaning