Cleanup package and server file