Code clean, removed unused methods