Remove unused method
Don't save unused variable
Provide default offset, fix update bug