remove redundant like and code cleanup