Implemented conflicts filter.

Also removed some unused functions.