fix warnings
remove notice
locks