Remove default lock fields
Cleanup code make compatible with 2.2.4+
Remove default category setting
Cleanup code
Cleanup code
Add comment for 2.2.4 version