Added remove function + server app