Some clean up. remove useless code
Merge commit '075877b1b96b49f58e32a645dc2580e07535e5cc'