Removed not needed features. Code cleaning