Remove and make it just simple