clean from unused methods and fix core