Progress towards server interaction; removing unneeded bloat