Removed devel code
Fixed shares and machines listing when none
Removed superglobal var as parameters