Removed keywords
Removed old tests