[IMP] [project]: imporove methods and remove not nessasery code.