REFACT: deleted some unused methods