app has been finish, needs cleaned up