Changes from V7 version:

- .remove function now is declarated with __devexit

Signed-off-by: Darius Augulis <augulis.darius@gmail.com>
---