Removed old stuff
Skip tests for now