Added missing method comments and removed unused class