LRA-116: remove magic numbers and literal string, beside remove unused