refactor + remove unused Signed-off-by: Gyuho Lee <leegyuho@amazon.com>
Signed-off-by: Gyuho Lee <gyuhox@gmail.com>