fixed branch after some cleanup