cleanup and adding deps for untellij 13