p3 compliciance, long fix, unused import