Removed old stuff
Merged from upstream