Remove unused statement and methods