removed standalone server
minor code cleanup