Remove FreeMart to simplify code