Removed unused variable
No '--client' option
Removed unable tests

Layout (maybe) not supported yet