Cleaned up some codes

Signed-off-by: tiendam <tien.dam@socketlabs.com>