final server: removed extra lines of code