Refactor and remove bank model