code clean, deleted previous poc codes