remove pointless variables and LOCK_FILE (?)