Minor changes, removing unused code