App cleaned, wip