Remove hardcoded commands

Add more modern and convenient way to remove users and directories.

Change-Id: I4bc0e7ced93a0c6b3faf7f65e5036ed0cd9bee89
Counter: 2
Merge "Remove hardcoded commands"