drop server things from master (see server branch)