delete internal helpers and modufy some headers