Merge "Remove useless/repetitive code"