Removed not used features