Removed all lock except one in RM.
Mattiaz are awesome and made uberhax.

Actually he just made a good delete.
Removed unnecessary comments and unused variables.
Merge branch 'master' into only_one_lock_in_RM
Merge remote-tracking branch 'origin/master' into Demo