Clean up unused import.
Fix used URL for reading via REST API and some moving stuff around.