remove uneeded boundaries code