Remove lines of code that cause warnings in classes.

No Ticket.

Reviewer: Aldrin