Added header and removed unused methods