cleanup source implementation

cleanup source implementation