Removed duplicate command
Fixed compatibility
Removed useless stuff