Remvoe two data-service prototypes and reformate several js files.