Merge "Removing unused code + little cleanup." into experimental