Update project, simplify code and remove extra