Removed not necessary code
Cleanup