Removed extra features from basic version