Remove garbage
Use conditional argument style for server parameter